From 44d483147502163f7c42c0faf708b23755da090b Mon Sep 17 00:00:00 2001 From: "kaf24@firebug.cl.cam.ac.uk" Date: Wed, 19 Apr 2006 18:39:36 +0100 Subject: [PATCH] Fix swapped calloc() arguments. Signed-off-by: Hollis Blanchard --- tools/ioemu/keyboard_rdesktop.c | 2 +- tools/libxc/xc_linux_restore.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/ioemu/keyboard_rdesktop.c b/tools/ioemu/keyboard_rdesktop.c index a98df10149..a660a5f9c9 100644 --- a/tools/ioemu/keyboard_rdesktop.c +++ b/tools/ioemu/keyboard_rdesktop.c @@ -75,7 +75,7 @@ static kbd_layout_t* parse_keyboard_layout(const char* language,kbd_layout_t* k) char* file_name=malloc(strlen(prefix)+strlen(language)+strlen(bios_dir)+1); if(!k) - k=calloc(sizeof(kbd_layout_t),1); + k=calloc(1, sizeof(kbd_layout_t)); strcpy(file_name,bios_dir); strcat(file_name,prefix); strcat(file_name,language); diff --git a/tools/libxc/xc_linux_restore.c b/tools/libxc/xc_linux_restore.c index ac17f41edb..571f5fd839 100644 --- a/tools/libxc/xc_linux_restore.c +++ b/tools/libxc/xc_linux_restore.c @@ -183,9 +183,9 @@ int xc_linux_restore(int xc_handle, int io_fd, /* We want zeroed memory so use calloc rather than malloc. */ - p2m = calloc(sizeof(unsigned long), max_pfn); - pfn_type = calloc(sizeof(unsigned long), max_pfn); - region_mfn = calloc(sizeof(unsigned long), MAX_BATCH_SIZE); + p2m = calloc(max_pfn, sizeof(unsigned long)); + pfn_type = calloc(max_pfn, sizeof(unsigned long)); + region_mfn = calloc(MAX_BATCH_SIZE, sizeof(unsigned long)); if ((p2m == NULL) || (pfn_type == NULL) || (region_mfn == NULL)) { ERR("memory alloc failed"); -- 2.30.2